diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 317208f..8ae47a1 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -85,12 +85,13 @@
 		// Convert quotes within tags to temporary markers. We don't want quotes converted 
 		// within tags so we'll temporarily convert them to {@DQ} and {@SQ}
 		// and we don't want double dashes converted to emdash entities, so they are marked with {@DD}
+		// likewise double spaces are converted to {@NBS} to prevent entity conversion
 		if (preg_match_all("#\<.+?>#si", $str, $matches))
 		{
 			for ($i = 0, $total = count($matches[0]); $i < $total; $i++)
 			{
 				$str = str_replace($matches[0][$i],
-									str_replace(array("'",'"','--'), array('{@SQ}', '{@DQ}', '{@DD}'), $matches[0][$i]),
+									str_replace(array("'",'"','--','  '), array('{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'), $matches[0][$i]),
 									$str);
 			}
 		}
@@ -180,7 +181,8 @@
 						'/\{@TAG\}/'		=> '<',
 						'/\{@DQ\}/'			=> '"',
 						'/\{@SQ\}/'			=> "'",
-						'/\{@DD\}/'			=> '--'
+						'/\{@DD\}/'			=> '--',
+						'/\{@NBS\}/'		=> '  '
 
 						);